merge
authorAndrew Warfield <andy@xensource.com>
Tue, 29 Aug 2006 22:58:57 +0000 (15:58 -0700)
committerAndrew Warfield <andy@xensource.com>
Tue, 29 Aug 2006 22:58:57 +0000 (15:58 -0700)

Trivial merge